Allow requesting money when expensify account owns workspace #30019

puneetlath · 2023-10-19T19:46:22Z

Details

Right now, we don't allow you to request money in any chat in which an Expensify account is a participant. However, there are certain workspaces that are owned by these accounts and members of those workspaces should be able to request money. I also made it possible to assign tasks in workspace chats if owned by expensify accounts.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/324780

Tests

In accountA create a workspace
Invite accountB to the workspace
Locally, set the accountID in one of these constants to be the accountID of accountA
Sign into accountB and go to the workspace chat for the workspace you were just invited to
Click the "+" button in the workspace chat
Make sure you do see the option to request money and to create tasks
Go to the DM with accountA
Make sure you do not see the option to request money
Go to the DM with Concierge (concierge@expensify.com)
Make sure you do not see the option to request money
Locally, revert the change to these constants
Go back to the workspace chat and make sure you are able to request money

Verify that no errors appear in the JS console

Offline tests

Same tests as online

QA Steps

Let's have @heyjennahay QA this internally.

Go to the DM with Concierge and click the "+" button in the DM
Make sure you are not able to request money
Go to a workspace chat on a workspace owned by accounting@expensify.com
Make sure you are able to request money
Go to the DM with accounting@expensify.com
Make sure you are not able to request money
Go to a workspace chat for a workspace owned by any non-expensify-restricted account
Make sure you are able to request money

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

cloudflare-workers-and-pages · 2023-10-19T19:47:54Z

Deploying with Cloudflare Pages

Latest commit:	`bd92d7e`
Status:	✅ Deploy successful!
Preview URL:	https://346b95da.helpdot.pages.dev
Branch Preview URL:	https://puneet-expensify-owner.helpdot.pages.dev

View logs

melvin-bot · 2023-10-20T16:20:27Z

@narefyev91 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

puneetlath · 2023-10-20T16:20:59Z

@narefyev91 I'm having trouble with my android emulator, so I haven't been able to get screenshots for that platform yet, but maybe you could still review while I figure that out?

puneetlath · 2023-10-20T20:44:38Z

Got Android working!

narefyev91 · 2023-10-23T11:44:57Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

narefyev91

LGTM!
🎀 👀 🎀 C+ reviewed

melvin-bot · 2023-10-23T11:45:44Z

@Li357 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

melvin-bot · 2023-10-23T11:45:48Z

🎯 @narefyev91, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #30170.

melvin-bot · 2023-10-23T11:45:59Z

@grgia Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

src/libs/ReportUtils.js

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js

puneetlath · 2023-10-30T21:41:48Z

@grgia @narefyev91 mind giving it another review?

melvin-bot · 2023-10-31T07:45:40Z

@youssef-lr Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

grgia

NAB

src/libs/ReportUtils.js

youssef-lr · 2023-10-31T17:09:43Z

src/libs/ReportUtils.js

+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function doExpensifyAccountsOwnPolicy(report) {


NAB but I feel like this is slightly clearer (at least to me :D)

Suggested change

function doExpensifyAccountsOwnPolicy(report) {

function isPolicyOwnedByExpensifyAccounts(report) {

Also, I think this might be better placed in actions/Policy.js (the file already contains similar helper functions) and can just take a policyID, we already have allPolicies in that file as well. What do you think?

A cleanup idea for later is to remove those helper functions from actions/Policy.js and into PolicyUtils

Good points. Though actually, I'm going to refactor the canCreateTaskInReport function below, which means we'll no longer need this function.

You're using it here as well, or will you also refactor this bit?

That's the only place it'll be used, so no need to be a separate function is my thinking. Do you agree? I updated the PR so you can see how I'm doing it now.

…y tests

src/libs/ReportUtils.js

youssef-lr

LGTM!

OSBotify · 2023-11-01T10:11:54Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-11-02T10:38:26Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.95-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-06T22:08:29Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.95-9 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-06T22:35:49Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.96-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

chiragsalian · 2023-11-07T22:31:44Z

src/libs/ReportUtils.js

+ */
+function canCreateTaskInReport(report) {
+    const otherReportParticipants = _.without(lodashGet(report, 'participantAccountIDs', []), currentUserAccountID);
+    const areExpensifyAccountsOnlyOtherParticipants = _.every(otherReportParticipants, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID));


Just a heads up, i believe the logic here caused this deploy blocker because it does not account for creating a task within an existing task.

Thanks for pointing that out! That's a good catch.

OSBotify · 2023-11-09T22:53:22Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.96-15 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

heyjennahay · 2023-11-10T09:13:16Z

I can confirm this is now working, thank you ❤️

Allow requesting money when expensify owns workspace

ba7bd17

puneetlath self-assigned this Oct 19, 2023

puneetlath added the InternalQA This pull request required internal QA label Oct 19, 2023

Allow assigning task in workspace chat where expensify is owner

bd92d7e

puneetlath marked this pull request as ready for review October 20, 2023 16:20

puneetlath requested a review from a team as a code owner October 20, 2023 16:20

melvin-bot bot requested review from narefyev91 and removed request for a team October 20, 2023 16:20

narefyev91 approved these changes Oct 23, 2023

View reviewed changes

melvin-bot bot requested a review from Li357 October 23, 2023 11:45

melvin-bot bot mentioned this pull request Oct 23, 2023

Payment issue for E/App PR#30019 #30170

Closed

melvin-bot bot requested a review from grgia October 23, 2023 11:45

grgia previously approved these changes Oct 23, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js Outdated Show resolved Hide resolved

Merge branch 'main' into puneet-expensify-owner

9b1e0e0

puneetlath dismissed grgia’s stale review via d6b13e2 October 30, 2023 21:31

abstract canCreateTaskInReport logic into function

481c5df

puneetlath force-pushed the puneet-expensify-owner branch from d6b13e2 to 481c5df Compare October 30, 2023 21:40

puneetlath requested review from narefyev91 and grgia October 30, 2023 21:41

prettier

baea0d2

narefyev91 approved these changes Oct 31, 2023

View reviewed changes

melvin-bot bot requested a review from youssef-lr October 31, 2023 07:45

merge main into branch

d9559b8

grgia previously approved these changes Oct 31, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

youssef-lr reviewed Oct 31, 2023

View reviewed changes

Use isDM check instead of policy owner

8bc920f

puneetlath dismissed grgia’s stale review via 8bc920f October 31, 2023 18:07

puneetlath requested review from youssef-lr and grgia October 31, 2023 18:10

Add isExpensifyOnlyParticipantInReport function back since its used b…

f35acb9

…y tests

puneetlath force-pushed the puneet-expensify-owner branch from 15bc73b to f35acb9 Compare October 31, 2023 18:22

youssef-lr reviewed Oct 31, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

Reduce isPolicyOwnedByExpensifyAccounts to one line

70a10f7

puneetlath requested a review from youssef-lr October 31, 2023 18:54

youssef-lr approved these changes Oct 31, 2023

View reviewed changes

grgia approved these changes Nov 1, 2023

View reviewed changes

grgia merged commit b57460d into main Nov 1, 2023
15 checks passed

grgia deleted the puneet-expensify-owner branch November 1, 2023 10:06

OSBotify mentioned this pull request Nov 2, 2023

Deploy Checklist: New Expensify 2023-11-02 #30752

Closed

bernhardoj mentioned this pull request Nov 3, 2023

[HOLD for payment 2023-11-13] Assign task – Unable to assign subtask in task report when create task in 1:1 DM. #30804

Closed

6 tasks

OSBotify mentioned this pull request Nov 6, 2023

Deploy Checklist: New Expensify 2023-11-06 #30929

Closed

chiragsalian reviewed Nov 7, 2023

View reviewed changes

esh-g mentioned this pull request Mar 4, 2024

Prevent threads from being counted as DMs #37030

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow requesting money when expensify account owns workspace #30019

Allow requesting money when expensify account owns workspace #30019

puneetlath commented Oct 19, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 19, 2023 •

edited

Loading

melvin-bot bot commented Oct 20, 2023

puneetlath commented Oct 20, 2023

puneetlath commented Oct 20, 2023

narefyev91 commented Oct 23, 2023

narefyev91 left a comment

melvin-bot bot commented Oct 23, 2023

melvin-bot bot commented Oct 23, 2023

melvin-bot bot commented Oct 23, 2023

puneetlath commented Oct 30, 2023

melvin-bot bot commented Oct 31, 2023

grgia left a comment

youssef-lr Oct 31, 2023 •

edited

Loading

youssef-lr Oct 31, 2023

puneetlath Oct 31, 2023

youssef-lr Oct 31, 2023 •

edited

Loading

puneetlath Oct 31, 2023

youssef-lr left a comment

OSBotify commented Nov 1, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

OSBotify commented Nov 6, 2023

chiragsalian Nov 7, 2023 •

edited

Loading

puneetlath Nov 7, 2023

OSBotify commented Nov 9, 2023

heyjennahay commented Nov 10, 2023

	function doExpensifyAccountsOwnPolicy(report) {
	function isPolicyOwnedByExpensifyAccounts(report) {

Allow requesting money when expensify account owns workspace #30019

Allow requesting money when expensify account owns workspace #30019

Conversation

puneetlath commented Oct 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

cloudflare-workers-and-pages bot commented Oct 19, 2023 • edited Loading

Deploying with Cloudflare Pages

melvin-bot bot commented Oct 20, 2023

puneetlath commented Oct 20, 2023

puneetlath commented Oct 20, 2023

narefyev91 commented Oct 23, 2023

Reviewer Checklist

Screenshots/Videos

narefyev91 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 23, 2023

melvin-bot bot commented Oct 23, 2023

melvin-bot bot commented Oct 23, 2023

puneetlath commented Oct 30, 2023

melvin-bot bot commented Oct 31, 2023

grgia left a comment

Choose a reason for hiding this comment

youssef-lr Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

youssef-lr Oct 31, 2023

Choose a reason for hiding this comment

puneetlath Oct 31, 2023

Choose a reason for hiding this comment

youssef-lr Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

puneetlath Oct 31, 2023

Choose a reason for hiding this comment

youssef-lr left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 1, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

OSBotify commented Nov 6, 2023

chiragsalian Nov 7, 2023 • edited Loading

Choose a reason for hiding this comment

puneetlath Nov 7, 2023

Choose a reason for hiding this comment

OSBotify commented Nov 9, 2023

heyjennahay commented Nov 10, 2023

puneetlath commented Oct 19, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 19, 2023 •

edited

Loading

youssef-lr Oct 31, 2023 •

edited

Loading

youssef-lr Oct 31, 2023 •

edited

Loading

chiragsalian Nov 7, 2023 •

edited

Loading